merge trunk
authorKenichi Handa <handa@m17n.org>
Fri, 28 Jan 2011 11:32:48 +0000 (20:32 +0900)
committerKenichi Handa <handa@m17n.org>
Fri, 28 Jan 2011 11:32:48 +0000 (20:32 +0900)

Trivial merge